Merge "Snap for 10440252 from 9bfb2024c36cef42ca6db068dcf7c79815cb8d90 to androidx-g3-release" into androidx-g3-release